linux: Fix current_vcpu_info for UP case

Under !CONFIG_SMP, smp.h is not always included and hence
smp_processor_id() not always visible.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
index ffe031b601cfc646b959ee2c658177e701ce9e75..1690e2dc33dbe9c08ef6f47cdaa4462eb54b91f2 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
@@ -57,7 +57,11 @@
 extern shared_info_t *HYPERVISOR_shared_info;
 
 #define vcpu_info(cpu) (HYPERVISOR_shared_info->vcpu_info + (cpu))
+#ifdef CONFIG_SMP
 #define current_vcpu_info() vcpu_info(smp_processor_id())
+#else
+#define current_vcpu_info() vcpu_info(0)
+#endif
 
 #ifdef CONFIG_X86_32
 extern unsigned long hypervisor_virt_start;